Skip to content

Merge in Develop branch #535

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
jondricek merged 30 commits into from
Apr 1, 2025
Merged

Merge in Develop branch #535

jondricek merged 30 commits into from
Apr 1, 2025

Conversation

@jondricek
Copy link
Contributor

@jondricek jondricek commented Mar 31, 2025

Develop has been stable for a while, and this gets us:

  • the Updates back in the sidebar
  • updated Copyright year
  • better scrolling experience in Data source pages
  • removed dependency on python-scss by refactoring CSS needs

adpare and others added 30 commits December 3, 2024 16:30
@adpare
add updates to resources sidebar
61c6e60
@adpare
Merge branch 'develop' of github.com:mitre-attack/attack-website into…
e441ddf 
… develop
@jondricek
Update typing information
6c8eb8d
@jondricek
Merge remote-tracking branch 'origin/master' into develop
521dd41
@jondricek
clean up whitespace in scss
64b3620
@jondricek
Strip whitespace
b1bc81b
@jondricek
Merge remote-tracking branch 'origin/master' into develop
67ee2e7
@jondricek
Change anchor-section on Data Source template
7ead378
@clemiller
Sticky Data Component name while scrolling techniques table
7e775a5
@clemiller
update copyright year
4c5193f
@jondricek
Update .gitignore
4d90ab6
@jondricek
Update pelican plugin for webassets to use from PyPI
f54c32b
@jondricek
Remove old pelican plugin that isn't used
81c736f
@jondricek
Update docstrings
f4200c2
@jondricek
Create new attack-style CSS approach
f009258
@adpare
update fonts location and create config file to set variables
bc51c29
@adpare
move files to accurately display font type
4af425b
@jondricek
Remove whitespace
46b622d
@jondricek
Remove empty file
3a9942e
@jondricek
Fix bg-alternate issue
d343040
@jondricek
Remove unused files
86c526d
@jondricek
Add .nvmrc
4454203
@jondricek
Remove unused dependency
7f6c6c5
@jondricek
Update CSS
bfc89df
@jondricek
Add npm commands to clean and copy
9ddf150
@jondricek
Add Readme for attack-style directory
ffe31f4
@jondricek
Merge pull request #530 from mitre-attack/528-update-pelican-webasset…
2ee216c 
…s-plugin

Update Scss management
@jondricek
Merge remote-tracking branch 'origin/master' into develop
2cb5667
@jondricek
Fix docstrings
d607ac8
@jondricek
Add macrotechnique refinement option
5b401b1
@sonarqubecloud
Copy link

sonarqubecloud bot commented Apr 1, 2025

Quality Gate Failed Quality Gate failed

Failed conditions
8 Security Hotspots
32 New Code Smells (required ≤ 5)
7 New Blocker Issues (required ≤ 0)
C Reliability Rating on New Code (required ≥ A)

See analysis details on SonarQube Cloud

Catch issues before they fail your Quality Gate with our IDE extension SonarQube for IDE

@jondricek jondricek merged commit aea33f4 into master Apr 1, 2025
3 of 4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@jondricek @adpare @clemiller